diff options
author | Bill Yi <byi@google.com> | 2015-08-26 22:45:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-08-26 22:45:55 +0000 |
commit | e616ff7e8d752d6020538323622fa27ef5faea28 (patch) | |
tree | ff57db26c2fea8cda4ab9ebbdebcc470485326c5 | |
parent | 21c75aa917d9f5728118af07f546573bd7866045 (diff) | |
parent | 2fec571b70b1724cef5415212b6e76fc5f6d534f (diff) | |
download | android-emulator-e616ff7e8d752d6020538323622fa27ef5faea28.tar.gz |
am 0498d64e: (-s ours) Merge commit \'8b468ac192571e59592e0341af56b5bcf462400a\' into HEAD
automerge: 2fec571
* commit '2fec571b70b1724cef5415212b6e76fc5f6d534f':
0 files changed, 0 insertions, 0 deletions