tree 0fb80a7596c0a5904193329d0e44822ebde7d916
parent 129b6d907b3c32a0f0a2e4fc585502484d47a1e4
parent 2c61db947a260b50a3950b15cd56e5fa9ce15457
author The Android Open Source Project <initial-contribution@android.com> 1365613569 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1365613569 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I4e13e11a8c42a8b316f60e9d37170e4787643099