| commit | 0eaf6bcef7acabfb711af7cb6d7fb22a12c608bd | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:28:55 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 15:28:55 2012 -0700 |
| tree | aee8594b43800f6d56f8b5f78062fced5af5b5a7 | |
| parent | a879ae65aa411b0537833663ce4c2923bae572fd [diff] | |
| parent | dd0d27b35c36b61b1a6a3d526bc2ce7ceefeaf80 [diff] |
am dd0d27b3: (-s ours) am 58973106: (-s ours) Reconcile with jb-dev - do not merge * commit 'dd0d27b35c36b61b1a6a3d526bc2ce7ceefeaf80':
