OSDN Git Service

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

Change-Id: Ib9fa0a30a03b74cf7ba495354b0a6ba156235bea


Trivial merge