| commit | 88e02da370c6541ad1d6034f1c2935b4fe243fe8 | [log] [tgz] |
|---|---|---|
| author | Eric Rowe <erowe@google.com> | Wed May 07 22:02:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 07 22:02:46 2014 +0000 |
| tree | 42207f7dcd288851ab2ff759f3ddfcaef0e1649a | |
| parent | 33942f0f376984c54f189cb174175998b9a032ca [diff] | |
| parent | 741644b64bbf503920cc6e8a8465d8066e971393 [diff] |
am 741644b6: resolved conflicts for merge of 266ac43b to stage-aosp-master * commit '741644b64bbf503920cc6e8a8465d8066e971393': Add all in one sensor verification