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)
commit1bc1761d36b75c7df41a56de486c94953ea2f3b5
tree5ffdcf62ae7e8645cd17d1147189dfbc2e3e3e7e
parent6445efde47551e2c14bff0bc01dfdf2bb5fadcfe
parent0c96c35fe47cd84f7423f925917b5dde97155e34
am 0c96c35f: am e86420e3: (-s ours) Merge "Fix flattening/unflattening of android::Sensor."

* commit '0c96c35fe47cd84f7423f925917b5dde97155e34':
  Fix flattening/unflattening of android::Sensor.