commit | c5adba2e2ae6024010d7e4b4bc622df630b484da | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:17:24 2012 -0700 |
committer | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:17:31 2012 -0700 |
tree | f2aa9ac2e6e144f3449b474a33d83745de5a29cf | |
parent | b6eb9247e57d1fd3b594042c6c7cce5e69adaa80 [diff] | |
parent | 37fd149ef28abca79291b000abbd422e179926f8 [diff] |
Reconcile with jb-dev - do not merge Change-Id: I5024199169618a15d91232c3232e47f0f2cc8820