| commit | 4eff1c15b229375020d0146a6a034f41dbfa1cbf | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 03 18:05:36 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 03 18:05:36 2013 -0700 |
| tree | 014cc83a83c91925063d2412be4b1b19d688ee71 | |
| parent | f04dfc0a5b00b24a59d74d972b03eda2788f39e9 [diff] | |
| parent | fb9442ee7bdcbd05d64d06d15437c72a51b3f94b [diff] |
am fb9442ee: Reconcile with jb-mr2-release - do not merge * commit 'fb9442ee7bdcbd05d64d06d15437c72a51b3f94b':