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