commit | 3b48949a3a61cf23d57f45cf7c0a3f94febdb376 | [log] [tgz] |
---|---|---|
author | Michael Wright <michaelwr@google.com> | Mon May 16 14:18:34 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon May 16 14:18:34 2016 +0000 |
tree | 291662b0bfd9b36f965582178fc317070d58fd68 | |
parent | 41a1901bbd11aaddd3fb528667bff06403224540 [diff] | |
parent | 22c6fff14f1c319d8295be6d0c1da91d4afb1fde [diff] |
Merge commit \'8b452b876b90dcfff1dab9012b65b5e67c4531a4\' into manual_merge_8b452b8 am: 2a9a993af9 * commit '2a9a993af99585af0bce6eca6d92c86370977a27': Add String16#contains and strstr16 methods. Change-Id: Icaa1c7f8d458d6f2651c72b376116e6952be9910