tree ae4b1ec5a307b6947599d6451b0403d7d94231e1
parent 0410d3ef3d9578177bffb06a657b1addab605167
parent 349a24991312310f2173963cb814f588585e5127
author The Android Open Source Project <initial-contribution@android.com> 1362423988 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1362423988 -0800

Reconcile with jb-mr2-release - do not merge

Change-Id: I0b8102a3962010378a8e19955a38c9cc44bd1c95