tree 8f78e3b53334bbaf8b4e81602e97409d4b093dae
parent 8a7d130fdfa22a4951dea57dc7462a1da744c12c
parent c4ade2fd424fa39d567a5d65924fbf6b94917d80
author The Android Open Source Project <initial-contribution@android.com> 1365032630 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1365032630 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Ifc3c604d1683fa9fb3b661438b8ddbc266e0657e