OSDN Git Service

Merge "Merge commit '5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 9 Jan 2017 23:18:20 +0000 (23:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 9 Jan 2017 23:18:24 +0000 (23:18 +0000)
commitcb012c79e87b77f1bac1e80bcdb65f717dcf8381
tree189d049ad858ac8f3744475ccc214a23c9e244b4
parent636fc0d54c1d83b1f889d69ea6dd11aa96033c38
parent4ca7a379da6c83c7db24f047f0f4eb3d8f6fe1f9
Merge "Merge commit '5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a am: 9f60453361  -s ours am: f22b197e08  -s ours" into nyc-mr2-dev-plus-aosp