| commit | 2b86ddb47d933df8179c01867590249effa12c67 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Jan 31 15:54:16 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Tue Jan 31 15:54:46 2017 -0800 |
| tree | c3bf7dcbc0a83a1f19ac9f2e77bd89e5050f3e91 | |
| parent | e6c9959fe4431af6fb3b054deba2581375120ba4 [diff] | |
| parent | 5eb1be561420ec881e32cc01de46f697b2dba3bb [diff] |
Merge stage-aosp-master into master. BUG: 34107289 Change-Id: I69366a5c8d0334c30bc51df7ba95eb086710ed45