commit | 7c8d2b63c01317c87aa8230497c3fc0df7ae1c28 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Thu Nov 08 15:19:11 2012 -0800 |
committer | Jean-Baptiste Queru <jbq@google.com> | Thu Nov 08 15:19:11 2012 -0800 |
tree | ce7c835accc47588ed3af7afc4390c88c9d63498 | |
parent | cf27115ae132c6870b449ea36164ed10c606109a [diff] | |
parent | 21fc49ac74164070748f2f5df1f912e47d4e9ec8 [diff] |
Merge from jb-mr1-dev-plus-aosp Change-Id: I28afbc0b04c22b9416973dc4d37783404997a4a3