tree ba5c1cd3f60ad35fb77a9a7fe76274f6387b27ac
parent 791308251247538bbeec8e1f10caff11ba8b5f48
parent be90175360b0f429bdd926fa6f05ee07ebea9d1f
author The Android Open Source Project <initial-contribution@android.com> 1371737892 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1371737892 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I36bc10874ee057cbcba8dc3d9d6c49415bfece45