commit | 4d1352f29f92127a503eee7504174055a47ede3c | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Jan 28 16:44:29 2013 -0800 |
committer | Jean-Baptiste Queru <jbq@google.com> | Mon Jan 28 16:44:29 2013 -0800 |
tree | 3271222b09eabcb0c82eb072c76b7a3d8b455a87 | |
parent | 348fb65f2f1248e5fbfa1f50b7f1d66356cfac55 [diff] | |
parent | 36812cec765785f80d23be5495ab499104975e4f [diff] |
Merge from jb-mr1-dev-plus-aosp Change-Id: I6ffd5eb159dbec6bb8819689c28dcf2b0778ff38