| commit | c0b3754ccc8f21eea2f605b3fa05d6610e7041ec | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 16:34:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 16:34:12 2015 +0000 |
| tree | 022fc1957d593f57a7a8c843397af3da6f837fca | |
| parent | 26d66e559735c91668db4baff3f4ebaf929da4b7 [diff] | |
| parent | 9897084378439aeb02e24e5c419bba776952c36b [diff] |
am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) * commit '9897084378439aeb02e24e5c419bba776952c36b':