OSDN Git Service

Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs
authorSreevani Sreejith <sreevanis@google.com>
Thu, 4 Aug 2016 02:14:25 +0000 (02:14 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 Aug 2016 02:14:26 +0000 (02:14 +0000)
commit3faf6114b04d4bdc2e8ef94bc054c4e268add700
tree72780e94aab40ee737d4a463a22373353bf7a8d5
parentb48909ed52df61412bacc94f8d4e995a22089f6a
parentd5cabb92bcbeaaa309893f1ea9f12053afcbe6a3
Merge "resolve merge conflicts of 9d47cae to nyc-docs" into nyc-docs