OSDN Git Service

Merge "resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus...
authorRobert Sesek <rsesek@google.com>
Thu, 13 Oct 2016 14:13:36 +0000 (14:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Oct 2016 14:13:39 +0000 (14:13 +0000)
commitadb4389cc1ef7e1a4547e52c67f3e1d10613e9ff
treef3d555074267d994f3bc5842f193654e65008964
parentf3d638b1d352ef913b4ae686bf9cf603de421767
parent0b58f198df6c3ce5df1d2061c54bd691ee32ac3a
Merge "resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp