| commit | 30232c5702fb760b4114d0064ea16d5053f53a7c | [log] [tgz] |
|---|---|---|
| author | estebandlc <estebandlc@google.com> | Thu Aug 27 21:36:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:36:53 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 0542d34db4b61817c438a9a6c84147b48e61c171 [diff] | |
| parent | f9e55b2c9fd6ffce9940849ff90f2bcdfd1f62ac [diff] |
am f9e55b2c: am 864cf7b3: (-s ours) am 69472e89: am 69d06f4c: Merge "Avoids race condition that leads to NPE." into studio-1.3-dev automerge: 7b02778 automerge: cd106c3 automerge: 69553f0 * commit 'f9e55b2c9fd6ffce9940849ff90f2bcdfd1f62ac':