OSDN Git Service

am e06f6d7a: am 4aec0446: (-s ours) am ed32594d: am 2cb9994c: Merge "dumpstate: remov...
authorNick Kralevich <nnk@google.com>
Thu, 27 Aug 2015 21:42:26 +0000 (21:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 21:42:26 +0000 (21:42 +0000)
* commit 'e06f6d7a85f005d906ee37b94eb59d4da10a178c':


Trivial merge