tree 97f03d1ca4030d0925ba82fd41398cf428aef0f8
parent fb231fea6cd4dac7323b1df74006b294c3c9bfef
parent 4a59376d5ee031e930e61292ed9e92e96e956724
author Elliott Hughes <enh@google.com> 1373408653 -0700
committer Elliott Hughes <enh@google.com> 1373408723 -0700

resolved conflicts for merge of 4a59376d to stage-aosp-master

Change-Id: I0e40180b46dc58781c218b8d382299dab73d49cc