commit | bb6fd7ff8cec893999b26e39dc62f1b4b4b9a8ea | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Sat Sep 21 01:25:18 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Sep 21 01:25:18 2013 +0000 |
tree | daebd79f8038a8bc44bd5fcc53c6b8695a8c54fb | |
parent | 90d51b1abe64442927c7e6bdbafc99f41a55f393 [diff] | |
parent | c30d92e2241ad329ceb67e216e1e5adfbfc84d99 [diff] |
Merge "Shut. Up." into klp-dev