OSDN Git Service

am 13a71754: am e2ab149a: (-s ours) am adaa79d7: Merge "Remove flag mDataInjectionMod...
authorAravind Akella <aakella@google.com>
Thu, 27 Aug 2015 15:08:32 +0000 (15:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 15:08:32 +0000 (15:08 +0000)
* commit '13a71754960eeba7c16c7986ed5dd811b815d268':


Trivial merge