OSDN Git Service

Merge changes I1e9eb842,I72046b93 am: 40658a5b36
authorNingyuan Wang <nywang@google.com>
Wed, 25 Jan 2017 00:08:27 +0000 (00:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Jan 2017 00:08:27 +0000 (00:08 +0000)
commita01713fffe4e8072eb7552377311b8f2d850830d
treefbb7e6fdf3980f1b91adb73466dc214836ed8aea
parentcb2c944541a3bd6d43884342690eb35a30e212f9
parentdc79aa803027cf7b549206568f9d4063990870aa
Merge changes I1e9eb842,I72046b93 am: 40658a5b36
am: dc79aa8030

Change-Id: I1fdb3f35059c436eb69161471a8a6f394ec5e9c5