tree 8d37c46183371d33865bf67804134e31c7292de6
parent 8290aa501f1b0354262c304962bc4da2e30457a8
parent 233b32f6e95863a0d57d0569c8752ba20983c6b4
author Dan Albert <danalbert@google.com> 1426200524 -0700
committer Dan Albert <danalbert@google.com> 1426200524 -0700

git commit -m "resolved conflicts for merge of d29f641b to stage-aosp-master"