OSDN Git Service

am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock...
authorsmain@google.com <smain@google.com>
Thu, 5 Mar 2015 06:18:45 +0000 (06:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Mar 2015 06:18:45 +0000 (06:18 +0000)
* commit '8b2be54a629e4567152d8b0e6c81332632b0b877':
  add tags for wakelock and other API names


Trivial merge