OSDN Git Service

Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev
authorMichal Karpinski <mkarpinski@google.com>
Thu, 13 Oct 2016 22:52:41 +0000 (22:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 22:52:41 +0000 (22:52 +0000)
commit949a485e29450700495b3ccdac475beed2527ab5
tree4be4c46d7f3acc232ad42b7980a73889f3146ce3
parentbc755da55cc00110a3c77b013c350a9b62c1f1cd
parenta6b3caf58e8ab18f4c3164afb8fba25e9954198b
Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev
am: a6b3caf58e

Change-Id: I9763e78b50a98dcf1139cdc299a8944e94c824d9