| commit | cc9002b131f42bfe2a0ad4aaded32f538fc663b5 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:00:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:00:28 2013 -0700 |
| tree | 63f5fd378c80fc9f7c33353cc9b128617229bae8 | |
| parent | ab9dce32319a47cc102b3f489f457cdd0f62f304 [diff] | |
| parent | 666a30d575e0e279ded82c24b446b7dd4596136e [diff] |
am 666a30d5: am 63cc80ff: (-s ours) am 1419f206: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '666a30d575e0e279ded82c24b446b7dd4596136e':