| commit | e521d70dfa67cff36f2b34eb3cfe74113a47d587 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 31 10:01:41 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 31 10:01:43 2016 +0000 |
| tree | 9ba887cf1b48f80c48c2c1b656917c795d89949c | |
| parent | 0075bf312c34bc98c3dd26d8233d25bf753a3256 [diff] | |
| parent | dc4e0336a0d759ade32a2c54db3b8c41a7725bd9 [diff] |
Merge "Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b am: f5464121c0" into nyc-mr1-dev-plus-aosp