| commit | f846ffcc02a8c1a03ddc035f8fa5bb82130034a0 | [log] [tgz] |
|---|---|---|
| author | Ed Tam <etam@google.com> | Mon Apr 13 16:29:05 2015 -0700 |
| committer | Ed Tam <etam@google.com> | Mon Apr 13 16:29:05 2015 -0700 |
| tree | 2e7c3c910aebf933d713d047218fc46c5296e269 | |
| parent | 7e0e4d2eb7605fb957bd876331c098a95a2c26aa [diff] | |
| parent | 79f338465213885900cea5a39f3aeeea083bbe51 [diff] |
resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp Change-Id: I24c60a2747931917a3ea09b953905ce0f4145280