tree 05f42afb7d801d2ff3c6b7a3ac0e05949f710b69
parent ec5c1c1e291062576925b80b532d36df118103f5
parent 35efcd275f90f5ffea371bb228a14b36c50e61d3
author Elliott Hughes <enh@google.com> 1423614053 -0800
committer Elliott Hughes <enh@google.com> 1423614053 -0800

resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aosp

Change-Id: I6f2ea07df2ab80a44301d9c3a2a8841c40a46002