| commit | bb3b27ac341efbfabd572e720a095c2fde0fdd1f | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Jul 29 11:08:05 2014 -0700 |
| committer | Ying Wang <wangying@google.com> | Tue Jul 29 11:08:05 2014 -0700 |
| tree | 3062928db78487b2774ce38fd06c325d372569a2 | |
| parent | a55c55ff5aa7436508d53ab86da965627671a8ff [diff] | |
| parent | 9929fd661c48d17b04a8590e1be647abce9ed04c [diff] |
resolved conflicts for merge of 9929fd66 to lmp-dev-plus-aosp Change-Id: I7f3b4111bb508e61d279fc4a78b2a2ebe8cfd6d9