| commit | 38ebfc09ea610687d028db5f0a7b8f6789932288 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Sat Jun 14 01:16:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 14 01:16:56 2014 +0000 |
| tree | 3603af42f528eea7522aadf5bacfd062cc0c5d1f | |
| parent | 54c61d5715715ac7f1c6a4f7a53f981e09dc7134 [diff] | |
| parent | 72dc1c22dc6a92dea925398c9e3880364ab29c1c [diff] |
am 72dc1c22: Merge "Revert "Backing this one out since the counterpart needs to be sent upstream."" * commit '72dc1c22dc6a92dea925398c9e3880364ab29c1c': Revert "Backing this one out since the counterpart needs to be sent upstream."