| commit | b8a35577d72ee4463c16c1200d73a1e770fe30d4 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@google.com> | Thu Sep 20 12:52:51 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 20 12:52:51 2012 -0700 |
| tree | 98da981993f52c5f25512cdb97babc69cd257989 | |
| parent | b1337dce87e1304b379b20887a610456b7796a1f [diff] | |
| parent | 85c118b1323a954786cb36f47fbfab9515a7950a [diff] |
am 85c118b1: am c4d68391: Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev * commit '85c118b1323a954786cb36f47fbfab9515a7950a': fix merge-event-log-tags.py deprecation warning