| commit | 1bb422d4528c1156c4bf7535614888f0c2b5cd07 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:17:32 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 15:17:32 2012 -0700 |
| tree | 7b6e5b3c23d037ba88990e863bf188f9da772e87 | |
| parent | 2d17b1aba6ea529dc618d50c784f69fb7f1a8141 [diff] | |
| parent | 2cb0549a18232b262b5c01b86319cbc6fece252e [diff] |
am 2cb0549a: Reconcile with jb-dev * commit '2cb0549a18232b262b5c01b86319cbc6fece252e':