| commit | a1b1813f99a55409be180592b666f6b89e4123a3 | [log] [tgz] | 
|---|---|---|
| author | Alex Ruiz <alruiz@google.com> | Thu Aug 27 22:00:08 2015 +0000 | 
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 22:00:08 2015 +0000 | 
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | be9ae4646d4afef42e87e948897e3d8ce9c34407 [diff] | |
| parent | e0c8330afa4dfd599f3ab8cd95d45b63068ece9e [diff] | 
am e0c8330a: am e66f8717: (-s ours) am 913cd98d: am e715ac6c: Merge "Removed checks for null that introduced bug." into studio-1.4-dev automerge: a58b9f6 automerge: 82178ea * commit 'e0c8330afa4dfd599f3ab8cd95d45b63068ece9e':