| commit | 110b37eeaf9bc8b13e077e066a5042af8ceafb54 | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Mon Nov 17 22:25:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 22:25:19 2014 +0000 |
| tree | 7798a7647c5f22768492a7e49b67a77e24855cc3 | |
| parent | 35e8e828bd0664489a6dc72e399a8a3223e2cb93 [diff] | |
| parent | 9ef17c4b5a706de802c35bbce7d568ef203a6ac9 [diff] |
am 9ef17c4b: Merge "Revert "Follow up to https://android-review.googlesource.com/114561"" * commit '9ef17c4b5a706de802c35bbce7d568ef203a6ac9': Revert "Follow up to https://android-review.googlesource.com/114561"