commit | f2701a8a6e1b5a056e4c8609713ff9b045fc1e82 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 13:26:41 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 13:26:41 2012 -0800 |
tree | ffeb7223cd0fcb786a826cce4da5367a7e4c4461 | |
parent | 4844b2068d9f036f9f036da58f2295927c8ee085 [diff] | |
parent | 5b96c405894aea0bfe31fc235a1bd4398da4bc2a [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I3cd40c84fd37293ca96b5c35bea6c34871bf7659