Merge "resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 20 Dec 2016 22:25:02 +0000 (22:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 20 Dec 2016 22:25:02 +0000 (22:25 +0000)
commita048f0632d1e38a435026883319882964cb6b467
tree325aaa1e530b9b2b3c8c5dd927b052ea2e39ab98
parent53e70a911c5c92ade6561f63603f71875a46f721
parent108d39675da6b7d72422666b05e82deb24346293
Merge "resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am: 52bab3789f" into nyc-mr2-dev-plus-aosp