OSDN Git Service

Merge "Update references to O MR1 to proper codename." into oc-mr1-dev
authorBryce Lee <brycelee@google.com>
Wed, 16 Aug 2017 17:30:43 +0000 (17:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 16 Aug 2017 17:30:43 +0000 (17:30 +0000)
commit92a84efba1405b856661423cb133cd9d4140116b
treef4937d3c897246962715ba21ea71611d2900a0ab
parent7fc53a11f839b1cbe779d4132f10aaa495ab3176
parent0e7b7c96be5e61f519ab2e5a258fa17d9c32efcb
Merge "Update references to O MR1 to proper codename." into oc-mr1-dev
core/java/android/app/Activity.java
services/core/java/com/android/server/am/ActivityRecord.java