tree 96a11e98bd932f50c6941174632ebd2faff10979
parent e713648969863d2903c6d622e4513b5c99db6aab
parent db3d93e9c91218b672609a90e7808ef81134fc8d
author Kenny Root <kroot@google.com> 1378316094 -0700
committer Kenny Root <kroot@google.com> 1378316094 -0700

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

Change-Id: Ica4f4c395fd45271548b7e5354da7d5371e5a820