commit | cd3936f72004c532c4c49ce4cedfae1ff9f23f56 | [log] [tgz] |
---|---|---|
author | Joe Fernandez <joefernandez@google.com> | Mon Jun 20 20:30:54 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 20 20:30:54 2016 +0000 |
tree | e268db9c05c7e14f1592469877edb1524cdd4b9f | |
parent | ed3b581d6421bb2c59ad692bcee8cd8628d7e29c [diff] | |
parent | a583a4bb8bbdc2f64206edb34bde59e42ca1452c [diff] |
Merge \"Merge \\\"docs: Narnia 2 advertising language update\\\" into nyc-dev am: ebad16f3c0 am: c7fd306a78\" into nyc-mr1-dev-plus-aosp am: a583a4bb8b Change-Id: If8cde019e56816d98f441a7ae9ca11bfc85d7619