| commit | 85614fdb99bd3f4d825090a1b6c5c1f3d8800d38 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 10:48:24 2014 +0900 |
| committer | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 10:48:24 2014 +0900 |
| tree | aa5989bfe2d81abe2f40524b33ab1644af41817c | |
| parent | 8ce30b9eebebd8d9318e5fd08cf0bd6ef4894792 [diff] | |
| parent | 56ec161d47856212008f47676577882f30853312 [diff] |
resolved conflicts for merge of 56ec161d to klp-dev-plus-aosp Change-Id: Idabec48d303cae126d9b80a2b1181f28927e2a9d