diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-02-26 18:36:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-26 18:36:57 +0000 |
| commit | fc0e95683e405f95d40284ce63d4c7c4f40af3f4 (patch) | |
| tree | 1a81b51e29fa8345f963de00cd427608a304bea9 | |
| parent | a1f6715c3f57430a17dfce55a045051ba9129502 (diff) | |
| parent | e9985026d78041cc9ea80ee7c59dd733bff44495 (diff) | |
| download | invensense-fc0e95683e405f95d40284ce63d4c7c4f40af3f4.tar.gz | |
am e9985026: resolved conflicts for merge of 6452c4ee to lmp-mr1-dev-plus-aosp
* commit 'e9985026d78041cc9ea80ee7c59dd733bff44495':
manta: batching and timestamp issues
0 files changed, 0 insertions, 0 deletions