| commit | 998a1748b68838ee2b1465c9e53de65453b0a047 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:44:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:44:28 2013 -0700 |
| tree | f8edaa28b0f5f96673cab25449fca91258e924b5 | |
| parent | 67e264de6b2367bc7522b51b1b3f52445e5dde6a [diff] | |
| parent | c3f789fd917ba413be8b6f73f87e49a8773bea41 [diff] |
am c3f789fd: am 7b52eac4: am 99a7231d: am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c3f789fd917ba413be8b6f73f87e49a8773bea41':