diff options
| author | Joe Onorato <joeo@google.com> | 2010-09-16 11:56:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 11:56:27 -0700 |
| commit | 6dc2a9f30ce318db113f8920fc11fd3f6bcea5a7 (patch) | |
| tree | 12d6bc907e715aaa6df435b0e73fc99b353a28bf | |
| parent | 1b0c3e2a4477e134e77235549b4fc0462f956515 (diff) | |
| parent | 390490e4ae768d541018038c782c52b471bb61de (diff) | |
| download | frameworks_base-6dc2a9f30ce318db113f8920fc11fd3f6bcea5a7.zip frameworks_base-6dc2a9f30ce318db113f8920fc11fd3f6bcea5a7.tar.gz frameworks_base-6dc2a9f30ce318db113f8920fc11fd3f6bcea5a7.tar.bz2 | |
am 390490e4: (-s ours) am ad7bce4c: Merge "DO NOT MERGE - Doclava warnings are now errors." into gingerbread
Merge commit '390490e4ae768d541018038c782c52b471bb61de'
* commit '390490e4ae768d541018038c782c52b471bb61de':
DO NOT MERGE - Doclava warnings are now errors.
0 files changed, 0 insertions, 0 deletions