tree 643f14340cd1d2c153e5a9e55fb460297c508fc8
parent 4b704541281db226deda9a45ea7e9de3ab247c86
parent aebc7ff81f8d05f21843c6696cc9db9af74ad4fe
author Kenny Root <kroot@google.com> 1363736174 -0700
committer Kenny Root <kroot@google.com> 1363736174 -0700

resolved conflicts for merge of aebc7ff8 to jb-mr2-dev

Change-Id: I3be0fafa767f73d0c6071ee238d9f0c26f8f1b61