| commit | 6806bc7ae050dc9d8381a0dfdf944cbf884fd17a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Feb 01 01:50:23 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 01 01:50:23 2017 +0000 |
| tree | c3bf7dcbc0a83a1f19ac9f2e77bd89e5050f3e91 | |
| parent | 5eb1be561420ec881e32cc01de46f697b2dba3bb [diff] | |
| parent | 2b86ddb47d933df8179c01867590249effa12c67 [diff] |
Merge stage-aosp-master into master. am: 2b86ddb47d Change-Id: I38201a6c91d567bba749c1b5d469a90233a2a437