commit | e15285c1fa96c9e3c3dacbe8f1a2e25b7be299f1 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon May 20 08:20:32 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon May 20 08:20:32 2013 -0700 |
tree | 3da1c15d55e85cf94d75b5a9e345ecd1b499ad53 | |
parent | 27b4511d4bee1ae302de2af0fd14c6b7361a7590 [diff] | |
parent | f7fea7522d422105ad7cf75987b4927c055bd292 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: I388b86949eef906330343df9a5b3166d0c21d743