| commit | e382d4da24d244ee8d0e842ff27f170998cb7aca | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 03 14:07:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 03 14:07:19 2013 -0700 |
| tree | 770b178458513a72defcae4f858396d19c7f02aa | |
| parent | c930c4e1f094b153a4d2440d40bd22e3280d1472 [diff] | |
| parent | 5871434ed6cb00895bba1bc253dcbfc49c453041 [diff] |
am 5871434e: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '5871434ed6cb00895bba1bc253dcbfc49c453041':