tree 4da76af1a81570a822e83765ef45291f158876d1
parent 87a6043e9330917f914a1ba4213c4ae101df8003
parent 6445344dbaf08ec4d8fbf6aeeffdf29faed64e78
author The Android Open Source Project <initial-contribution@android.com> 1355956422 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1355956422 -0800

Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ic1386b1ea77872e99819f8b7132a8419fc41cb5e