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)
commitf73e78fe1cb6803a29f7f85b49792f4e8a7350c8
treed793d1a2637a998b7cb8f14740ce0d67637f0ef5
parente0bcc4efe96f196104e6de681b28de295d70fb84
parent671d5965f7b15ecba10453e8f445418dc0e730e6
Merge "Fixes for sm and pm usage" am: ffb15da518
am: 671d5965f7

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