tree 26c988da40785375f5c2fc6d49f129bc0e6a10b2
parent d254dc54c15001e3deb8e5bbb402ceb19a091eed
parent c9ea793119ed472b19f8fcef1755b5fff3e73d27
author David 'Digit' Turner <digit@google.com> 1440698295 +0000
committer android-build-merger <android-build-merger@google.com> 1440698295 +0000

resolved conflicts for merge of 71e0dd32 to mnc-dev-plus-aosp automerge: fbeb2aa  -s ours
automerge: c9ea793  -s ours

* commit 'c9ea793119ed472b19f8fcef1755b5fff3e73d27':