| commit | eb7ba88b5b2712c94b22230042ad30b894eb0271 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Jan 11 16:33:41 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Thu Jan 12 00:55:10 2017 +0000 |
| tree | ce8eb15ec1c30922d6f2e4ee29e2884ed2249f1a | |
| parent | 6432f6a84d0e42152929b3904c242959b4c0d66a [diff] | |
| parent | 03aa215cccab68da5fdfe000029201982edebe68 [diff] |
Merge commit '03aa215cccab68da5fdfe000029201982edebe68' into stage-aosp-master. BUG: 34107289 Change-Id: I8ea0b5cce44fb48d51c7e3e4ce7a5dca755c476a