| commit | d39c01c93ca9514d48261424fd75c666b655c49f | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Thu Oct 23 08:48:36 2014 -0700 |
| committer | Craig Mautner <cmautner@google.com> | Thu Oct 23 08:48:36 2014 -0700 |
| tree | deaf7c3246be6d7c15e9b4217d165d3b5b582464 | |
| parent | 1d9184035d5d74c850d688cd269e97ea3f77953e [diff] | |
| parent | 933d807c5d5402f1a084fd4714e0b69852446cc0 [diff] |
resolved conflicts for merge of 933d807c to lmp-mr1-dev-plus-aosp Change-Id: I183baf510e084e07244a8583c0bd162cd9715b50