tree 9b13770e53b6efa2fee92a2733baecc249a7fbd7
parent 2c9213763f7b7423c26dacbc59c61635bf01d4f4
parent 1958f10d1c31eaa3232cdf636056b9d129efba20
author The Android Open Source Project <initial-contribution@android.com> 1368708230 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1368708230 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I46e32f210b004047f9b3714595cbdea459eafedd