OSDN Git Service

resolve merge conflicts of 9d47cae to nyc-docs
authorsreevanis <sreevanis@google.com>
Thu, 4 Aug 2016 02:23:39 +0000 (02:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Aug 2016 02:23:39 +0000 (02:23 +0000)
commitfdaac48e99ea56bde1c877473415ddb85ea18cd2
tree9866c99ee0fc5f7be0c2d08011160b99fc13ae7b
parentbdbe6fd94fd7152c02860cc0a2b24e2390d06390
parentd5cabb92bcbeaaa309893f1ea9f12053afcbe6a3
resolve merge conflicts of 9d47cae to nyc-docs
am: d5cabb92bc

Change-Id: Ie16cc1707e8cff7eaa2691c7e9257a26bc6aeead