| commit | a8b5f7e73703c3d57086f7aded1749a0801dd997 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Aug 10 13:04:27 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Aug 10 13:04:27 2015 -0700 |
| tree | 957c5391ec43f5f7b1129fcf15025c5dc5cd7d6b | |
| parent | 1d4a76c50f3f7d7cbc576e993239eb33f8456ff0 [diff] | |
| parent | b699685ebd33f48c11c5cedcc2743efc374a682c [diff] |
resolved conflicts for merge of b699685e to mnc-dev-plus-aosp Change-Id: I1a298440130d6310523babdbbbf67c0fc1d8d48a