tree 087eaefffcd35f9c4968408ea80080cda39e22ac
parent 935fd8d0b1c7953e6e6610aea0c2d09d0fa8ba97
parent 3fc5e3cabfd9787e722b7720eabbcbba49984a94
author Andreas Gampe <agampe@google.com> 1416594974 -0800
committer Andreas Gampe <agampe@google.com> 1416594974 -0800

resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp

Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019