| commit | 1bc1761d36b75c7df41a56de486c94953ea2f3b5 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jun 06 10:36:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 06 10:36:08 2014 +0000 |
| tree | 5ffdcf62ae7e8645cd17d1147189dfbc2e3e3e7e | |
| parent | 6445efde47551e2c14bff0bc01dfdf2bb5fadcfe [diff] | |
| parent | 0c96c35fe47cd84f7423f925917b5dde97155e34 [diff] |
am 0c96c35f: am e86420e3: (-s ours) Merge "Fix flattening/unflattening of android::Sensor." * commit '0c96c35fe47cd84f7423f925917b5dde97155e34': Fix flattening/unflattening of android::Sensor.