| commit | f2b60c0f8052ed6b456e2f63a0e6798d049410ad | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Mar 21 17:25:08 2014 -0700 |
| committer | Colin Cross <ccross@android.com> | Fri Mar 21 17:25:08 2014 -0700 |
| tree | 1ef8e88b2188c0c7007b8c459d1cb1c70905779b | |
| parent | e3290e9e46c2df798e08f3d939dd58de8d3d0862 [diff] | |
| parent | f8e4d1b730e101bbb3b4fb6fe2ac4bb267cf5371 [diff] |
resolved conflicts for merge of f8e4d1b7 to master Change-Id: I387a979ac119fc9423af6f07b6700c85384aeb94