OSDN Git Service

Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0...
authorsreevanis <sreevanis@google.com>
Thu, 4 Aug 2016 02:51:42 +0000 (02:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Aug 2016 02:51:42 +0000 (02:51 +0000)
commitd93f2930983274891f03970630d2c316f39e3b84
treef260818d7cf0dbcba220a556a1eff4fd40fd40b5
parent31e80831ccead01bca9c3fba16b40bd903b9933d
parentec62c0780f09e06ad254aa4a03c0194099806caa
Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0 am: f5a2fbc156
am: ec62c0780f

Change-Id: I87e184de26394bf6c8dd29f0c3c40ecaa7ce42a9