| commit | c414e45db5c50161bd78c9e369679107843c60b6 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:21:23 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 15:21:23 2012 -0700 |
| tree | 05f946f60b77358424a451df3e42d82c09dccf8c | |
| parent | fbd18e1a04a49d1ff51e403b68f1a70a5fb19979 [diff] | |
| parent | 06cf41b3aa46fc963d54196a0b3f4c0e09553d31 [diff] |
am 06cf41b3: (-s ours) am c5adba2e: (-s ours) Reconcile with jb-dev - do not merge * commit '06cf41b3aa46fc963d54196a0b3f4c0e09553d31':