| commit | e3ac8f86ba4209f084bd7859307133d2a52e9e4f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:20:04 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:20:09 2012 -0700 |
| tree | 91cf8ed04d7c4184a2fbc756fa9b0c9ccefbf81a | |
| parent | 597814bbc6e5f6a49c2fec67657a9e3202c394e2 [diff] | |
| parent | 1e216b1991630350ee97b98ccfc68383661d804c [diff] |
Reconcile with jb-dev - do not merge Change-Id: Iadd39182f5f5854ea570b681513f9012c6d9254b