diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 12:28:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 12:28:05 -0700 |
| commit | 803b245ef485f16245234a42b8885a2ec50c5e5a (patch) | |
| tree | 1accede5e43bb6ad38058079de2f839ad5bd22f3 | |
| parent | 917e120f736f95292a40b6c7da9940d6369955e1 (diff) | |
| parent | 469dbc0aec2b85c3ac9947f1d1572c27bd5ce99e (diff) | |
| download | extras-803b245ef485f16245234a42b8885a2ec50c5e5a.tar.gz | |
am 469dbc0a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '469dbc0aec2b85c3ac9947f1d1572c27bd5ce99e':
0 files changed, 0 insertions, 0 deletions