| commit | 3057f46f8176f7ef5801eb2676a41365bea82805 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Fri Mar 14 11:46:30 2014 -0700 |
| committer | Jeff Hao <jeffhao@google.com> | Fri Mar 14 11:46:30 2014 -0700 |
| tree | 38def8681d8463dc9940a8e8f6be140e6df705d0 | |
| parent | 79558d550fd60dfb66e814b95bd286b7ddca9074 [diff] | |
| parent | 773965c0168c5bd19d727ddb950c74382dcb9fa4 [diff] |
resolved conflicts for merge of 773965c0 to klp-dev-plus-aosp Change-Id: I43747a469e8d409397f3d88f6f6f6daaf5fbb372