| commit | 8950c62362d35c96c03bac5a411dca042e044733 | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Tue Mar 15 20:04:36 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 15 20:04:36 2016 +0000 |
| tree | e9d0e2875defcd089154c648c2f3291fe7384531 | |
| parent | 8689804cc90c88bb360abed5a78109a8493d287d [diff] | |
| parent | ed8e4d8529a16c62b104fd460d55222c958ee4ed [diff] |
Merge "Don't override the setting activity shortcut" into nyc-dev