| commit | 985917adfcf1c79a2505bc88030641f81d1137d2 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Aug 27 10:45:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:45:09 2015 +0000 |
| tree | a95a90828dca11dc7e4b162afa9bdeb6f469c444 | |
| parent | 278c1051381a577af303165afd8395c63a2a6b71 [diff] | |
| parent | 3d00f479ee0ec1b7c7a3e59d614cc641960a7a24 [diff] |
am 3d00f479: (-s ours) am 5db8aeca: Merge to upstream r244004. * commit '3d00f479ee0ec1b7c7a3e59d614cc641960a7a24':