| commit | 1ca76ab9848c81e407f3fd6d05b775d517e175b3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 22:43:20 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 22:43:20 2013 +0000 |
| tree | f0a5dd6cf8d00e71291fa284cd13ecfb45f33c60 | |
| parent | 22dfc2b2cb21b56e893be494b664e3f4fc85d1b7 [diff] | |
| parent | 023dddfb4dd995dc8874a3667d42f728fa460e30 [diff] |
am 023dddfb: am 7e0bd69e: am 12b61826: am 61ea9d98: Reconcile with jb-mr1-release - do not merge * commit '023dddfb4dd995dc8874a3667d42f728fa460e30':