| commit | 27d49f769ee8e4eb9b8ac585c7e199689eae01c6 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 17:54:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 17:54:30 2015 +0000 |
| tree | 33fb52badb33fc4a5572d2b91e6389d4ce4c5720 | |
| parent | 2d9e0fdd843067398760cac06f9299c14ef0cfb4 [diff] | |
| parent | 88aa40df01b83b05574a38ad1688ae930e150818 [diff] |
am 88aa40df: 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 - * commit '88aa40df01b83b05574a38ad1688ae930e150818':