commit | 05a341399881b4fa32b41949b3861caa2540afdb | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Fri Sep 20 18:30:47 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 20 18:30:47 2013 -0700 |
tree | 0d6994a105f49e34a58ebf25560f2de4ea0d8ec0 | |
parent | c430e0dc7693a8fbe02900a02bb4be7e089b3cef [diff] | |
parent | ff7f43eb08e3f2d98e7b8f09e733ef015e3fe168 [diff] |
am ff7f43eb: am bb6fd7ff: Merge "Shut. Up." into klp-dev * commit 'ff7f43eb08e3f2d98e7b8f09e733ef015e3fe168': Shut. Up.