am e86420e3: (-s ours) Merge "Fix flattening/unflattening of android::Sensor."

Browse Source

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

...

This commit is contained in:

Narayan Kamath 2014-06-06 10:33:18 +00:00 committed by Android Git Automerger

parent 53b4926828 e86420e399

commit 0c96c35fe4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available