tree dd262e7952902ec1e79eacf0708fe363ec36f357
parent 66bbfb6b2ccedecba3cbd0843b5a9ae498c68c82
parent 7382c02d6204806c0462a98ea4e3524007f1fc86
author Neil Fuller <nfuller@google.com> 1421760118 +0000
committer Neil Fuller <nfuller@google.com> 1421760118 +0000

resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp

Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0