| commit | f8fab17322ebc221fb493331c3a93b2d852704ae | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 14 12:16:12 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 14 12:16:12 2013 -0700 |
| tree | db8e77861a69e1399b60541a5ba622cc8ea27ef6 | |
| parent | 66956dc063351f30434da9b6bb62183b50996583 [diff] | |
| parent | fb2188d1390841285181256a0ec37c5558c971da [diff] |
am fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'fb2188d1390841285181256a0ec37c5558c971da': "JWR66Y"