| commit | 35e8e828bd0664489a6dc72e399a8a3223e2cb93 | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Mon Nov 17 10:09:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 10:09:33 2014 +0000 |
| tree | f4bcdf4181459e24af1ea09f39f0649cbb1ddd86 | |
| parent | 9e3ad29c193d40dd21efeb269114e6a1c389826a [diff] | |
| parent | 1a8ae0549dda4b0e3bb80623f4f87027a0fbfabf [diff] |
am 1a8ae054: Merge "Follow up to https://android-review.googlesource.com/114561" * commit '1a8ae0549dda4b0e3bb80623f4f87027a0fbfabf': Follow up to https://android-review.googlesource.com/114561