OSDN Git Service

am 0c96c35f: am e86420e3: (-s ours) Merge "Fix flattening/unflattening of android...
authorNarayan Kamath <narayan@google.com>
Fri, 6 Jun 2014 10:36:08 +0000 (10:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Jun 2014 10:36:08 +0000 (10:36 +0000)
* commit '0c96c35fe47cd84f7423f925917b5dde97155e34':
  Fix flattening/unflattening of android::Sensor.


Trivial merge