commit | 927372aec399b7c63d193c57c69b57065e7b66e5 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 13:29:21 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 13:29:21 2012 -0800 |
tree | a8ff26f9376a1bba4a5b9e536e3fb6eeb313cb37 | |
parent | 41048d670d42075732723e72d7f303498690ea99 [diff] | |
parent | f3456803fed4ff529dea53fd9bc338887886acf9 [diff] |
am f3456803: Reconcile with jb-mr1-release - do not merge * commit 'f3456803fed4ff529dea53fd9bc338887886acf9':