| commit | bd5a3e6510e83b161a0e40c191d349524ae4a8e6 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 17:53:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 17:53:55 2014 +0000 |
| tree | 108b74a37137a498820c0aaa7d6d4f9c35186b61 | |
| parent | 0ad4f2cedde037c2b09a7f09c5f95f0984267c64 [diff] | |
| parent | 1677a9bdeba3961625236925e754920fca1b7e89 [diff] |
am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp * commit '1677a9bdeba3961625236925e754920fca1b7e89': resolve conflicts for merge 5a7b3b65 correctly