OSDN Git Service

Merge "Bp/n/sFoo -> Bp/n/sHwFoo" am: cb5989d239
authorYifan Hong <elsk@google.com>
Thu, 12 Jan 2017 02:08:38 +0000 (02:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Jan 2017 02:08:38 +0000 (02:08 +0000)
am: aef68e76b4

Change-Id: I44fc295a1500962062773aa9ac31c3ab347a627f


Trivial merge