| commit | a4c0ad00cafc8a1dd059e277e2cfd1f5aefe176f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Sep 24 10:15:02 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 10:15:02 2012 -0700 |
| tree | 92833b2e74192f8f0c31db40a50d426e0596d6f1 | |
| parent | 413185316e9e6f0713185d9adc733b2768ab5aa1 [diff] | |
| parent | f8b2fd392056205559d1bcab13050fbf83ff406e [diff] |
am e5913938: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'e5913938bb99f1efb6cd49d29b67362e5833e086':