| commit | 363509f5459560af2244bddd508e057b7539a7e3 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Mar 13 07:09:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 13 07:09:43 2015 +0000 |
| tree | cd4a0cb49f6717bc6659095706a376ad3a00436c | |
| parent | 37a4ddfcb30792b74c676c14abcbc8d2a44a6279 [diff] | |
| parent | 0a1ce9cae10bf7e2e6640e2a8f1efe7062c47292 [diff] |
am 0a1ce9ca: Merge to upstream r231075. * commit '0a1ce9cae10bf7e2e6640e2a8f1efe7062c47292': Merge to upstream r231075.