| commit | d1dd7fbb468e76ef322bff7bf74e09fbacf8c731 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 14:34:05 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 14:34:05 2013 -0800 |
| tree | f365064955324801bd043e2d1d9b2c348d03acc6 | |
| parent | 55947a234322322ef431462492ef2c267d150d73 [diff] | |
| parent | 80db4328e2d0e802fefa66e24d2f609f624058ae [diff] |
am 80db4328: am ca849386: Reconcile with jb-mr1-release - do not merge * commit '80db4328e2d0e802fefa66e24d2f609f624058ae':