| commit | 2674a953c8bc6baf9a0157afb7948b77893c5827 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Wed Jul 15 17:51:56 2015 -0700 |
| committer | Tor Norbye <tnorbye@google.com> | Wed Jul 15 17:51:56 2015 -0700 |
| tree | e882168e768003a8d24786f1393cef11bcbf2306 | |
| parent | bb99d714c56b50d7ad85b83b379627ee6d268efb [diff] | |
| parent | ee1dd12c1167e523c3dfa7bc18f57856c2fe7901 [diff] |
resolve merge conflicts of ee1dd12 to studio-1.4-dev. Change-Id: I80d67aef005f88d84d739809e4bc6a61e49bd2d1