tree 593ddd402e4cced409a9f64ddfdfb49c3cdd6d4c
parent 64a4f4caaef4d4aad7e0794ea4f9b8a233ad7cb5
parent c9a7b558434b0c266dd095f786ca0a14c5a1f24a
author Eric Laurent <elaurent@google.com> 1467395806 -0700
committer Eric Laurent <elaurent@google.com> 1467395806 -0700

resolve merge conflicts of c9a7b55 to nyc-mr1-dev-plus-aosp

Change-Id: I07b5b3213dd034ebed781648ccc8158c077f493f