OSDN Git Service

Merge "Fixes for sm and pm usage" am: ffb15da518
authorBrian Carlstrom <bdc@google.com>
Thu, 5 Nov 2015 18:48:22 +0000 (18:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Nov 2015 18:48:22 +0000 (18:48 +0000)
am: 671d5965f7

* commit '671d5965f7b15ecba10453e8f445418dc0e730e6':
  Fixes for sm and pm usage


Trivial merge