| commit | 3019a5e1d11eca0d9a8396cf6684f72767eb6d6e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 08 13:45:16 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 08 13:45:16 2013 -0700 |
| tree | b2b0a4258c47880bbd237d93de2a6c3f8616df7c | |
| parent | f71b96406391fc00c1d3dc45e6b3e827f3595842 [diff] | |
| parent | a8d29082843cc22bb37fcd88ae581affdf0eaec7 [diff] |
am a8d29082: (-s ours) am d5c8247f: Reconcile with jb-mr2-release - do not merge * commit 'a8d29082843cc22bb37fcd88ae581affdf0eaec7':