| commit | 0a19c517b775ad0e3a66d896dd8a3b01bb476e08 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Sep 16 10:55:08 2014 -0700 |
| committer | Kenny Root <kroot@google.com> | Tue Sep 16 10:55:08 2014 -0700 |
| tree | 477c9f45d3278c04f3fe8bba235979c6b1938452 | |
| parent | 912514eeb7bc0e466ecafc5a3d9dda81fc1e5a93 [diff] | |
| parent | d9714d344ce5688bb8c170b74cacd500d2c47662 [diff] |
resolved conflicts for merge of d9714d34 to lmp-mr1-dev-plus-aosp Change-Id: I11b38509c1e82f2a3d22be23ec45bfb023e0ee18