| commit | 864272f3eb1700b999275887a61dd228f8a565a9 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Oct 01 13:47:12 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Wed Oct 01 13:47:12 2014 -0700 |
| tree | a12b7684194dbd7f6495b6806ba14d4985390067 | |
| parent | b3ad87e6b1599a9b8881134f3491232aec722815 [diff] | |
| parent | fe50cfd53309af4dd49e572bd4a3120ea1494029 [diff] |
resolved conflicts for merge of fe50cfd5 to lmp-dev-plus-aosp Change-Id: Iea93ad20b44f0183f1868f078dd7982b2798fcd3