commit | 371ab9058e923679e7dd451bc8351e6e0ce0c3b0 | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Thu Aug 27 03:38:43 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 03:38:43 2015 +0000 |
tree | 69d6a47242f47951fc81617abee8d63d8b26de93 | |
parent | ea5d8f0affc1170fc9bd6ff05a00adca712f18d6 [diff] | |
parent | 7daa48e62fa0ba002cffeddf8d520426a52d69a7 [diff] |
am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp * commit '7daa48e62fa0ba002cffeddf8d520426a52d69a7':