| commit | 42c230f6a7840119183aa4d5831d73d159acf580 | [log] [tgz] |
|---|---|---|
| author | Tarandeep Singh <tarandeep@google.com> | Wed May 20 21:48:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 20 21:48:36 2015 +0000 |
| tree | 61648008db91813c520ccb7f0a1e4f1ff0de9b0c | |
| parent | ab715011f72ca3961e979dafe682a47b40b859ee [diff] | |
| parent | 5687be745902ec2506c7417b482929d689b5fbb5 [diff] |
am 5687be74: am 8a0661bd: (-s ours) am 86d35d35: am 18ca571e: am 4f78c253: (-s ours) Merge "DO NOT MERGE: Merged Fixes for CTS Sensor test from master" into lollipop-mr1-cts-dev * commit '5687be745902ec2506c7417b482929d689b5fbb5':