tree 18c9342bc883f0446970c590e0d5b56cbfcca292
parent c6b76767193322b086caad0d3968552e0229b28f
author Brian Carlstrom <bdc@google.com> 1406739192 -0700
committer Brian Carlstrom <bdc@google.com> 1407372460 -0700

resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp

(cherry picked from commit 4a5a11e416425689d9f37a1963ae852051b451d2)

Change-Id: Ic5c2297d50f2e59ca5b1eb0c3b81328d23a48253