tree cfda7da423704d2509a861cf62c4c9a4010f3954
parent 3472ee25e9759305930d19ce6615cd93ec49ea37
parent 4c016bdfaf7231cee6dd1a2d0e3b7585df530b4a
author The Android Open Source Project <initial-contribution@android.com> 1348675634 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348675634 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I022d926d864e521c9710842374f70b5d74742ad5