tree d87aff94eb7bf4841855c0b402934e943d95175a
parent 731c791e73a9177c98402ae4ee341181110bf792
parent b69b073a536544ef07c9510af7cecf69edfb1862
author Harsh Modi <harshmodi@google.com> 1418688487 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418688489 +0000

Merge "Use elpasedRealtime() instead of uptime() in ProjectionOffscreenActivity" into lmp-sprout-dev