| commit | cf15f43bc92fa6c911a7a2d0722ff19f9334bd49 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Thu Jun 05 14:29:44 2014 -0700 |
| committer | Brian Carlstrom <[email protected]> | Thu Jun 05 14:31:35 2014 -0700 |
| tree | f512a6a85240e54778b03831e706b78ee76d1c7e | |
| parent | b0a80d3cc10bc3783bb3cb26cebbd343e8710408 [diff] | |
| parent | f021a8c5de47431d0fd8c5fbcc377c709867dd0c [diff] |
resolved conflicts for merge of f021a8c5 to jb-mr2-dev-plus-aosp Change-Id: Ic8636fac97430a434d8e03dd98d97e2f85d1c491