| commit | ecfbe05797c819be8d5f3c9dc88e4140a69d5583 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:13:16 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 19:13:16 2012 -0700 |
| tree | b61af043d561117a75ad2ea4e60d713cf46fdf05 | |
| parent | 12ab9f830c476257742efbfb254dbb07f3b6158f [diff] | |
| parent | eb9f65453fff5c6170f9a1e877abdf9f6de15f78 [diff] |
am eb9f6545: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'eb9f65453fff5c6170f9a1e877abdf9f6de15f78':