tree 1a1d04c3761e4a8e121edf60f7216c14041bed24
parent b91a2fe1a2fd1f96ed5a1a4543143429060b9691
parent 427622e1c0981ac63c95384b058ece10632debd1
author Ying Xu <yinxu@google.com> 1494868794 +0000
committer android-build-merger <android-build-merger@google.com> 1494868794 +0000

Merge "Dummy implementation of the Subsecond Switching API." am: 7281c7bc8f am: 374f863100
am: 427622e1c0

Change-Id: I116cc9f18dc4aada614bde651385f1e5b2d393f6