OSDN Git Service

am ec6d674c: am cf16ca16: am dac3f4af: Merge "Whitelist another exception during...
authorBrian Carlstrom <bdc@google.com>
Mon, 14 Jul 2014 20:39:45 +0000 (20:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Jul 2014 20:39:45 +0000 (20:39 +0000)
* commit 'ec6d674ccf584984cdc454622442216f042de4d0':


Trivial merge