| commit | d2bd9bafd91577990249a906611fae8820fce247 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 16:16:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 16:16:09 2015 +0000 |
| tree | a47ada7870666d00a4b1a5df6fea5dd56c9d9072 | |
| parent | 4e5b7ad592fba5a8265e43455f2821d38cb26e77 [diff] | |
| parent | 8d3096352caf669c013556ca0a434ab72ff47ced [diff] |
am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) * commit '8d3096352caf669c013556ca0a434ab72ff47ced':