| commit | ae2f2913f921308a276ba43ed17fd8fb3f5c4117 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 10 10:08:21 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 10 10:08:21 2013 -0700 |
| tree | 890595946c44ff05f572c282bd732368ac39e970 | |
| parent | 2fdf92f389625e565005f5db8675e470fb3acf8f [diff] | |
| parent | bf8aff00c6183cd09282e280c6662191b3f2f502 [diff] |
am bf8aff00: Reconcile with jb-mr2-release - do not merge * commit 'bf8aff00c6183cd09282e280c6662191b3f2f502':