OSDN Git Service

Merge changes from topic "am-d37d37956b3e49d89a31faaa131fd1fc" into oc-mr1-dev-plus...
authorAndre Eisenbach <eisenbach@google.com>
Sat, 16 Sep 2017 15:33:22 +0000 (15:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 16 Sep 2017 15:33:22 +0000 (15:33 +0000)
commita91bad79f7793c1765e7cc057817a56b3f85aa70
tree91c1d15d2b15804a824e71863e774b84849e610a
parentf1465a4ec57d7a80538597396535331620c94e1d
parentaf7b3b007f72f7e529414ba5d48261e72caae85b
Merge changes from topic "am-d37d37956b3e49d89a31faaa131fd1fc" into oc-mr1-dev-plus-aosp
am: af7b3b007f  -s ours

Change-Id: Ie9c4ac48cae1b04cd7d7ea2124715349f951a467