Merge "resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214 am: 5e80b7e463...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 6 May 2016 19:17:51 +0000 (19:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 May 2016 19:17:51 +0000 (19:17 +0000)
commit48687114b6c5310c8939700c8422a2c80bcddfca
tree0499a82b4b6536377735d7314e0ba60b262229a4
parent1b8fe1f99900105f97dca9d1534d96214bde57a8
parent8f5db0cf0fc2ca0bd22c50cf9768257b8f18871a
Merge "resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214 am: 5e80b7e463" into nyc-mr1-dev-plus-aosp