| commit | 5fee534a8aad8f732d85d6d5862a4b81aebf4db0 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Nov 08 19:53:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 08 19:53:07 2016 +0000 |
| tree | 2c1d94b4d03408567cf27c8d72d31f059d2e8272 | |
| parent | d447124c00b37da341cf88d9cb533e35d684a89a [diff] | |
| parent | 5d5230348864049f0acc674840312ade5a690d96 [diff] |
resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660d am: 5d52303488 Change-Id: I15771163a003a498dbe7d9731f90e29171b97d7d