| commit | 2578a5ce691aece367ce2759e2ea4f54dc7695a0 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Nov 07 20:05:59 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 07 20:05:59 2017 +0000 |
| tree | 9ec3b7d9c312c063f4c09b9723564e8751791e11 | |
| parent | 14735f23490aba9e4d4f6c5ea6d7986103320701 [diff] | |
| parent | 83bf2811204f17eb0771cf25750f4729d280d516 [diff] |
Merge commit '6e6df26ed3086f6e208abfcd2bba5242f67ac78a' from oc-mr1-dev-plus-aosp into stage-aosp-master. am: 83bf281120 Change-Id: I7ede7bb8da2996df1edd9cb45b178af024c8ceb4