commit | 4e8ba13e1ba1a8876b254def2c889b507332b608 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:23:40 2012 -0700 |
committer | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:23:42 2012 -0700 |
tree | 3108d3cf10a92b99720a7d118ded4971d7f9303e | |
parent | 452d9e3b71fa9edbb113363b723716eae5dc1da2 [diff] | |
parent | 4197904988b77082b774110a9e61e6353c7ddcb4 [diff] |
Reconcile with jb-dev - do not merge Change-Id: I279cb59abafe23786bc22470b5aac06cc3d93f2c