| commit | 9942cb83c438238e5b486b20c07c166c727b00c6 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 13 22:05:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 13 22:05:19 2013 -0700 |
| tree | adfa8dcf5c4baa229f9a0d8beccce3c49853372a | |
| parent | 80db4328e2d0e802fefa66e24d2f609f624058ae [diff] | |
| parent | 9983e817b20980afd321739d80f99164a6b79bb0 [diff] |
am 9983e817: am ca849386: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9983e817b20980afd321739d80f99164a6b79bb0':