| commit | 88aa40df01b83b05574a38ad1688ae930e150818 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 17:34:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 17:34:18 2015 +0000 |
| tree | f3d1f99c00762b8299d8c6fc1681156eea88ee44 | |
| parent | f6cf3cdd41434bf4888aed9248e2c58b35c93c41 [diff] | |
| parent | b4ef2aba5d4ab45ec535f851580a42b170d31850 [diff] |
am b4ef2aba: am f2a8aa34: am fdcade18: am ff246059: am 5fc6ca11: am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: 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 'b4ef2aba5d4ab45ec535f851580a42b170d31850':