| commit | 5cad7119761d3074497fbf33f2cd5854ae5c19d6 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 08 13:40:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 08 13:40:28 2013 -0700 |
| tree | baf0801ea5fd50d8403d58d8ec68123e9e619c8a | |
| parent | 7066da4ea9d9fa8be3a5416ab68a27efb141abf6 [diff] | |
| parent | 2e1be1756081ef7300c42f2e7906c316539d7930 [diff] |
am 2e1be175: Reconcile with jb-mr2-release - do not merge * commit '2e1be1756081ef7300c42f2e7906c316539d7930':