| commit | 1a4208b6667dbd4db07d455b2b91d3fb23b447c7 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Tue Jun 17 12:01:27 2014 -0700 |
| committer | Brian Carlstrom <[email protected]> | Tue Jun 17 12:02:55 2014 -0700 |
| tree | 4be719a556892773994fba7d1b4532000d4cd180 | |
| parent | 13e2fdfa8c689a3f6e3fc5d2c8c3cea9c85c0387 [diff] | |
| parent | cd4735f380c11b151f2f22e5fcb5a132e78b329a [diff] |
resolved conflicts for merge of cd4735f3 to jb-dev-plus-aosp Change-Id: I2e5f49ebb6f765ccec6449262cc2c546b2a765b5