| commit | 99a7231d50daaacbdb35513b327b475d4de44e3f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:47:18 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:47:18 2013 -0700 |
| tree | 3a2d0c289e0ead79c8df7d582fa043bc8f975f0c | |
| parent | 18d688c94bb8e1e26de2d12445cb3096c6126f75 [diff] | |
| parent | 9708aa4e5e1d2909119eed2b47f06e932fc512a2 [diff] |
am 9708aa4e: (-s ours) am 12bc4c4b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9708aa4e5e1d2909119eed2b47f06e932fc512a2':