| commit | 4fb063a320a309c0b13ade1d68fb24c86ae5b683 | [log] [tgz] |
|---|---|---|
| author | Dmitry Grinberg <dmitrygr@google.com> | Wed Aug 06 21:42:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 06 21:42:54 2014 +0000 |
| tree | 4836ac826e8cddadc2cba3bf7cc5fcf7e0c9ba0b | |
| parent | c331807e3c3a0e15180a11325e1635ae5268aa39 [diff] | |
| parent | 4badab05fadbe71a8759f46c1997ecec07700b7d [diff] |
am 4badab05: (-s ours) am c4766e31: Revert "commit 001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530" * commit '4badab05fadbe71a8759f46c1997ecec07700b7d': Revert "commit 001ccea74ec61b1be00c8ede827f55c0359d1051 Author: Nitin Shivpure <nshivpur@codeaurora.org> Date: Tue Jun 17 16:29:18 2014 +0530"