| commit | f3fc5a6d29cf7cadc0ac1bd4567042aac27ec543 | [log] [tgz] |
|---|---|---|
| author | Mingyao Yang <mingyao@google.com> | Tue Jul 29 21:47:26 2014 -0700 |
| committer | Mingyao Yang <mingyao@google.com> | Tue Jul 29 21:47:26 2014 -0700 |
| tree | acb71cf90f57a28176ff5cc050cb55a30ee5023a | |
| parent | 4b8fb144c790ccfa7556d2c4bda143d3725d5d9c [diff] | |
| parent | e19f2b00eebd61e73761ab531866654f08968711 [diff] |
resolved conflicts for merge of e19f2b00 to lmp-dev-plus-aosp Change-Id: I678a541f0bcef726db44ccb50cb6feb71ec498e5