| commit | 420773ae53d7109eb2d4c6d95610861b5cfe85f0 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Nov 07 14:20:57 2014 -0800 |
| committer | Dan Albert <danalbert@google.com> | Fri Nov 07 14:20:57 2014 -0800 |
| tree | 6be8ddedc3319b438c3a2d112280a52db0e43172 | |
| parent | 1d2352661b95348e9be6da9f38433d23a35b57ab [diff] | |
| parent | ebc320900cf208fa4a495db4b3788179425cd898 [diff] |
resolved conflicts for merge of ebc32090 to lmp-mr1-dev-plus-aosp Change-Id: Icfa9c3424a2e75a07eaa453663b03a12897809a9