commit | e8566ffbd9c3aa5d3c298fb00d849e2667a26519 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Sat Aug 08 16:41:06 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 16:41:06 2015 +0000 |
tree | ddb56ffb1afcec4869c46207dd72aff816a0b703 | |
parent | a6f725d6fe091ae022109f86d1b5b0de104f85f3 [diff] | |
parent | c0b3754ccc8f21eea2f605b3fa05d6610e7041ec [diff] |
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 'c0b3754ccc8f21eea2f605b3fa05d6610e7041ec':