OSDN Git Service

Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0
authorSreevani Sreejith <sreevanis@google.com>
Thu, 4 Aug 2016 02:38:47 +0000 (02:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Aug 2016 02:38:47 +0000 (02:38 +0000)
commit6421beee8ec8f370aec918d967fb9fda38ef545e
treea898613c1044f8b16f2e7b9eb763b6a2db32dbf9
parent8888f022223e5bc3100cc092d3ffe8fbc1fcb074
parentf5a2fbc156674a58837b568ea4992eaf1c7fb1a9
Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs am: 3faf6114b0
am: f5a2fbc156

Change-Id: I37eb8462dcf65783d64c71336ee0d7fc8a354c4e