tree ee0deb7f1f9bd87e35cf6a8a7bb1d638de1c145e
parent 280fe930a432d9e2ead8c4b58ce76a0ee45742e7
parent 7289f3ab8f05db6206d696d75f460fadc05dc731
author Jeff Brown <jeffbrown@google.com> 1397087260 -0700
committer Jeff Brown <jeffbrown@google.com> 1397087260 -0700

resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp

Change-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded